From ee23fd5b9eb3e33a38a65c9a61592c45f1aa5ba0 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 19 Oct 2014 18:52:24 +0200 Subject: Removed obsolete tr1::shared_ptr. --- src/Globals.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/Globals.h b/src/Globals.h index b84607355..e0a25ed83 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -361,19 +361,8 @@ void inline LOGD(const char* a_Format, ...) #define assert_test(x) ( !!(x) || (assert(!#x), exit(1), 0)) #endif -// Allow both Older versions of MSVC and newer versions of everything use a shared_ptr: -// Note that we cannot typedef, because C++ doesn't allow (partial) templates to be typedeffed. -#if (defined(_MSC_VER) && (_MSC_VER < 1600)) - // MSVC before 2010 doesn't have std::shared_ptr, but has std::tr1::shared_ptr, defined in included earlier - #define SharedPtr std::tr1::shared_ptr -#elif (defined(_MSC_VER) || (__cplusplus >= 201103L)) - // C++11 has std::shared_ptr in , included earlier - #define SharedPtr std::shared_ptr -#else - // C++03 has std::tr1::shared_ptr in - #include - #define SharedPtr std::tr1::shared_ptr -#endif +// Unified shared ptr from before C++11. Also no silly undercores. +#define SharedPtr std::shared_ptr -- cgit v1.2.3